From f53c8860229c31c0b544dc37df6a88ffa17cff71 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 22 Jun 2005 14:45:48 +0000 Subject: [PATCH] bitkeeper revision 1.1726.1.2 (42b9799cvxl7PK_CkhwRTPueXP17ew) Fix defintion of PAGE_MASK so that pae builds again. Signed-off-by: Keir Fraser --- xen/include/asm-x86/page.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index 87a47f8667..29b9f518a8 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -2,13 +2,13 @@ #ifndef __X86_PAGE_H__ #define __X86_PAGE_H__ -#ifndef __ASSEMBLY__ -#define PAGE_SIZE (1UL << PAGE_SHIFT) -#else +/* + * It is important that the masks are signed quantities. This ensures that + * the compiler sign-extends a 32-bit mask to 64 bits if that is required. + */ #define PAGE_SIZE (1 << PAGE_SHIFT) -#endif -#define PAGE_MASK (~(intpte_t)(PAGE_SIZE-1)) -#define PAGE_FLAG_MASK (~0U) +#define PAGE_MASK (~(PAGE_SIZE-1)) +#define PAGE_FLAG_MASK (~0) #ifndef __ASSEMBLY__ # include -- 2.30.2